Install gdk tests
authorMatthias Clasen <mclasen@redhat.com>
Wed, 18 Oct 2017 01:19:44 +0000 (09:19 +0800)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 18 Oct 2017 15:30:20 +0000 (17:30 +0200)
This was missing so far

testsuite/gdk/cairo.test.in [new file with mode: 0644]
testsuite/gdk/cursor.test.in [new file with mode: 0644]
testsuite/gdk/display.test.in [new file with mode: 0644]
testsuite/gdk/encoding.test.in [new file with mode: 0644]
testsuite/gdk/keysyms.test.in [new file with mode: 0644]
testsuite/gdk/meson.build
testsuite/gdk/rectangle.test.in [new file with mode: 0644]
testsuite/gdk/rgba.test.in [new file with mode: 0644]
testsuite/gdk/seat.test.in [new file with mode: 0644]

diff --git a/testsuite/gdk/cairo.test.in b/testsuite/gdk/cairo.test.in
new file mode 100644 (file)
index 0000000..26fd33e
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/cairo --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/cursor.test.in b/testsuite/gdk/cursor.test.in
new file mode 100644 (file)
index 0000000..25e5c8a
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/cursor --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/display.test.in b/testsuite/gdk/display.test.in
new file mode 100644 (file)
index 0000000..ea2b75b
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/display --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/encoding.test.in b/testsuite/gdk/encoding.test.in
new file mode 100644 (file)
index 0000000..07ad561
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/encoding --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/keysyms.test.in b/testsuite/gdk/keysyms.test.in
new file mode 100644 (file)
index 0000000..4eb2596
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/keysyms --tap -k
+Type=session
+Output=TAP
index b74d6544224fc8aca9e711819a93a2c3b7c3532f..0694b424e05a0b8bebf0191af12c4ac23fe5b2f9 100644 (file)
@@ -1,6 +1,8 @@
+testexecdir = join_paths(installed_test_bindir, 'gdk')
+testdatadir = join_paths(installed_test_datadir, 'gdk')
+
 tests = [
   'cairo',
-  # 'check-gdk-cairo' # disabled in Makefile.am
   'cursor',
   'display',
   'encoding',
@@ -10,14 +12,29 @@ tests = [
   'seat',
 ]
 
-test_env = environment()
-test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-
 foreach t : tests
-  test_exe = executable(t, '@0@.c'.format(t), dependencies : libgtk_dep)
+  test_exe = executable(t, '@0@.c'.format(t),
+                        dependencies: libgtk_dep,
+                        install: get_option('install-tests'),
+                        install_dir: testexecdir)
+
+  test(t, test_exe,
+       args: [ '--tap', '-k' ],
+       env: installed_test_env,
+       suite: 'gdk')
 
-  test(t, test_exe, suite : 'gdk', env : test_env)
 endforeach
 
-# TODO: installed tests + .test files
+if get_option('install-tests')
+  test_cdata = configuration_data()
+  test_cdata.set('libexecdir', gtk_libexecdir)
+
+  foreach t : tests
+    configure_file(input: '@0@.test.in'.format(t),
+                   output: '@0@.test'.format(t),
+                   configuration: test_cdata,
+                   install: true,
+                   install_dir: testdatadir)
+  endforeach
+
+endif
diff --git a/testsuite/gdk/rectangle.test.in b/testsuite/gdk/rectangle.test.in
new file mode 100644 (file)
index 0000000..b3b9617
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/rectangle --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/rgba.test.in b/testsuite/gdk/rgba.test.in
new file mode 100644 (file)
index 0000000..ae3f7e0
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/rgba --tap -k
+Type=session
+Output=TAP
diff --git a/testsuite/gdk/seat.test.in b/testsuite/gdk/seat.test.in
new file mode 100644 (file)
index 0000000..dade2ef
--- /dev/null
@@ -0,0 +1,4 @@
+[Test]
+Exec=@libexecdir@/installed-tests/gtk-4.0/gdk/seat --tap -k
+Type=session
+Output=TAP